update to Gtk+ version 1.1.3, binary age 1, interface age 1.

Wed Sep 23 06:09:19 1998  Tim Janik  <timj@gtk.org>

        * configure.in: update to Gtk+ version 1.1.3, binary age 1,
        interface age 1.

        * gtk/gtkobject.c
        (gtk_object_ref):
        (gtk_object_unref): check for ->ref_count to be greater than 0 (the
        existing code was buggy in letting ->ref_count==0 pass through and
        then failing the living_objs_ht assertion).

        * gtk/gtkclist.c (draw_row): fix chopping bug for right justified
        pixtext fields (Roman Pozlevich <roma@botik.ru>).

diff --git a/ChangeLog b/ChangeLog
index 6ebbe0812cb5708ccf08905b8c472577cb3e2336..29731854160b7c8731c3eb3a94a63f51865ca87a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Wed Sep 23 06:09:19 1998  Tim Janik  <timj@gtk.org>
+
+       * configure.in: update to Gtk+ version 1.1.3, binary age 1,
+       interface age 1.
+
+       * gtk/gtkobject.c
+       (gtk_object_ref): 
+       (gtk_object_unref): check for ->ref_count to be greater than 0 (the
+       existing code was buggy in letting ->ref_count==0 pass through and
+       then failing the living_objs_ht assertion).
+
+       * gtk/gtkclist.c (draw_row): fix chopping bug for right justified
+       pixtext fields (Roman Pozlevich <roma@botik.ru>).
+
 Mon Sep 21 23:53:18 CDT 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * Released GTK+ 1.1.2

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 6ebbe0812cb5708ccf08905b8c472577cb3e2336..29731854160b7c8731c3eb3a94a63f51865ca87a 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,17 @@
+Wed Sep 23 06:09:19 1998  Tim Janik  <timj@gtk.org>
+
+       * configure.in: update to Gtk+ version 1.1.3, binary age 1,
+       interface age 1.
+
+       * gtk/gtkobject.c
+       (gtk_object_ref): 
+       (gtk_object_unref): check for ->ref_count to be greater than 0 (the
+       existing code was buggy in letting ->ref_count==0 pass through and
+       then failing the living_objs_ht assertion).
+
+       * gtk/gtkclist.c (draw_row): fix chopping bug for right justified
+       pixtext fields (Roman Pozlevich <roma@botik.ru>).
+
 Mon Sep 21 23:53:18 CDT 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * Released GTK+ 1.1.2

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6ebbe0812cb5708ccf08905b8c472577cb3e2336..29731854160b7c8731c3eb3a94a63f51865ca87a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,17 @@
+Wed Sep 23 06:09:19 1998  Tim Janik  <timj@gtk.org>
+
+       * configure.in: update to Gtk+ version 1.1.3, binary age 1,
+       interface age 1.
+
+       * gtk/gtkobject.c
+       (gtk_object_ref): 
+       (gtk_object_unref): check for ->ref_count to be greater than 0 (the
+       existing code was buggy in letting ->ref_count==0 pass through and
+       then failing the living_objs_ht assertion).
+
+       * gtk/gtkclist.c (draw_row): fix chopping bug for right justified
+       pixtext fields (Roman Pozlevich <roma@botik.ru>).
+
 Mon Sep 21 23:53:18 CDT 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * Released GTK+ 1.1.2

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 6ebbe0812cb5708ccf08905b8c472577cb3e2336..29731854160b7c8731c3eb3a94a63f51865ca87a 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,17 @@
+Wed Sep 23 06:09:19 1998  Tim Janik  <timj@gtk.org>
+
+       * configure.in: update to Gtk+ version 1.1.3, binary age 1,
+       interface age 1.
+
+       * gtk/gtkobject.c
+       (gtk_object_ref): 
+       (gtk_object_unref): check for ->ref_count to be greater than 0 (the
+       existing code was buggy in letting ->ref_count==0 pass through and
+       then failing the living_objs_ht assertion).
+
+       * gtk/gtkclist.c (draw_row): fix chopping bug for right justified
+       pixtext fields (Roman Pozlevich <roma@botik.ru>).
+
 Mon Sep 21 23:53:18 CDT 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * Released GTK+ 1.1.2

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 6ebbe0812cb5708ccf08905b8c472577cb3e2336..29731854160b7c8731c3eb3a94a63f51865ca87a 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,17 @@
+Wed Sep 23 06:09:19 1998  Tim Janik  <timj@gtk.org>
+
+       * configure.in: update to Gtk+ version 1.1.3, binary age 1,
+       interface age 1.
+
+       * gtk/gtkobject.c
+       (gtk_object_ref): 
+       (gtk_object_unref): check for ->ref_count to be greater than 0 (the
+       existing code was buggy in letting ->ref_count==0 pass through and
+       then failing the living_objs_ht assertion).
+
+       * gtk/gtkclist.c (draw_row): fix chopping bug for right justified
+       pixtext fields (Roman Pozlevich <roma@botik.ru>).
+
 Mon Sep 21 23:53:18 CDT 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * Released GTK+ 1.1.2

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 6ebbe0812cb5708ccf08905b8c472577cb3e2336..29731854160b7c8731c3eb3a94a63f51865ca87a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,17 @@
+Wed Sep 23 06:09:19 1998  Tim Janik  <timj@gtk.org>
+
+       * configure.in: update to Gtk+ version 1.1.3, binary age 1,
+       interface age 1.
+
+       * gtk/gtkobject.c
+       (gtk_object_ref): 
+       (gtk_object_unref): check for ->ref_count to be greater than 0 (the
+       existing code was buggy in letting ->ref_count==0 pass through and
+       then failing the living_objs_ht assertion).
+
+       * gtk/gtkclist.c (draw_row): fix chopping bug for right justified
+       pixtext fields (Roman Pozlevich <roma@botik.ru>).
+
 Mon Sep 21 23:53:18 CDT 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * Released GTK+ 1.1.2

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6ebbe0812cb5708ccf08905b8c472577cb3e2336..29731854160b7c8731c3eb3a94a63f51865ca87a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,17 @@
+Wed Sep 23 06:09:19 1998  Tim Janik  <timj@gtk.org>
+
+       * configure.in: update to Gtk+ version 1.1.3, binary age 1,
+       interface age 1.
+
+       * gtk/gtkobject.c
+       (gtk_object_ref): 
+       (gtk_object_unref): check for ->ref_count to be greater than 0 (the
+       existing code was buggy in letting ->ref_count==0 pass through and
+       then failing the living_objs_ht assertion).
+
+       * gtk/gtkclist.c (draw_row): fix chopping bug for right justified
+       pixtext fields (Roman Pozlevich <roma@botik.ru>).
+
 Mon Sep 21 23:53:18 CDT 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * Released GTK+ 1.1.2

diff --git a/configure.in b/configure.in
index 2097b33ea7e58abdc72973a3337593fbabdd045c..6e5a48d172a45e2dcb40fab9efff4801fda67a07 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -14,9 +14,9 @@ cflags_set=${CFLAGS+set}
 #
 GTK_MAJOR_VERSION=1
 GTK_MINOR_VERSION=1
-GTK_MICRO_VERSION=2
-GTK_INTERFACE_AGE=0
-GTK_BINARY_AGE=0
+GTK_MICRO_VERSION=3
+GTK_INTERFACE_AGE=1
+GTK_BINARY_AGE=1
 GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
 AC_SUBST(GTK_MAJOR_VERSION)
 AC_SUBST(GTK_MINOR_VERSION)

diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index c2579a7b61e245cc5408be91bf57814d701817a2..82c9e22b80ef3c9d00bbdcbff75a139c5d8bbdf4 100644 (file)
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -3636,8 +3636,8 @@ draw_row (GtkCList * clist,
          gdk_window_get_size (GTK_CELL_PIXTEXT (clist_row->cell[i])->pixmap, &width, &height);
          pixmap_width = width;
          width += GTK_CELL_PIXTEXT (clist_row->cell[i])->spacing;
-         width = gdk_string_width (GTK_WIDGET (clist)->style->font,
-                                   GTK_CELL_PIXTEXT (clist_row->cell[i])->text);
+         width += gdk_string_width (GTK_WIDGET (clist)->style->font,
+                                    GTK_CELL_PIXTEXT (clist_row->cell[i])->text);
          break;
 
        case GTK_CELL_WIDGET:

diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c
index 6639830a253973feafbcbed8489d46d2fe2de6f4..af56761724e2c8362fa3b16248a29e7572da8e65 100644 (file)
--- a/gtk/gtkobject.c
+++ b/gtk/gtkobject.c
@@ -1033,6 +1033,7 @@ gtk_object_ref (GtkObject *object)
 {
   g_return_if_fail (object != NULL);
   g_return_if_fail (GTK_IS_OBJECT (object));
+  g_return_if_fail (object->ref_count > 0);
 
   object->ref_count += 1;
 }
@@ -1042,12 +1043,16 @@ gtk_object_unref (GtkObject *object)
 {
   g_return_if_fail (object != NULL);
   g_return_if_fail (GTK_IS_OBJECT (object));
+  g_return_if_fail (object->ref_count > 0);
   
   if (object->ref_count == 1)
-    gtk_object_destroy (object);
+    {
+      gtk_object_destroy (object);
   
-  if (object->ref_count > 0)
-    object->ref_count -= 1;
+      g_return_if_fail (object->ref_count > 0);
+    }
+
+  object->ref_count -= 1;
 
   if (object->ref_count == 0)
     {